"event->state & modifiers", not "event->state && modifiers". Patch by

2005-12-05  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkfilechooserdefault.c (trap_activate_cb): "event->state &
	modifiers", not "event->state && modifiers".  Patch by Sadrul
	Habib Chowdhury <imadil@gmail.com>.  Fixes bug #323073.

diff --git a/ChangeLog b/ChangeLog
index 6f3868a2941a8abb95bc48f79c455cefdcb26ccc..c306721db60fd9fe739f7c43013b1b4c88064604 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-05  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (trap_activate_cb): "event->state &
+       modifiers", not "event->state && modifiers".  Patch by Sadrul
+       Habib Chowdhury <imadil@gmail.com>.  Fixes bug #323073.
+
 2005-12-05  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkwidget.c: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6f3868a2941a8abb95bc48f79c455cefdcb26ccc..c306721db60fd9fe739f7c43013b1b4c88064604 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-12-05  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilechooserdefault.c (trap_activate_cb): "event->state &
+       modifiers", not "event->state && modifiers".  Patch by Sadrul
+       Habib Chowdhury <imadil@gmail.com>.  Fixes bug #323073.
+
 2005-12-05  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkwidget.c: 

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 00a78a9706cb7c170de288ba3aa71ea49ffbb6c4..cf1f8f733c36f53f3c13933eaf57c468c8d57470 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -3303,7 +3303,7 @@ trap_activate_cb (GtkWidget   *widget,
        || event->keyval == GDK_ISO_Enter
        || event->keyval == GDK_KP_Enter
        || event->keyval == GDK_space)
-      && ((event->state && modifiers) == 0)
+      && ((event->state & modifiers) == 0)
       && !(impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
           impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
     {